core: Modify pack file importer to also optionally checksum

For future work on importing from an archive.

diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index ace9067ec1507446f165237cc39297efdc913735..a0fe8bdea2269e116f125e0df6ed4baa0ea7f245 100644 (file)
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -566,8 +566,9 @@ ostree_pack_file_for_input (GOutputStream     *output,
                             GFileInfo         *finfo,
                             GInputStream      *instream,
                             GVariant          *xattrs,
-                            GCancellable     *cancellable,
-                            GError          **error)
+                            GChecksum        **out_checksum,
+                            GCancellable      *cancellable,
+                            GError           **error)
 {
   gboolean ret = FALSE;
   guint32 uid, gid, mode;
@@ -579,6 +580,7 @@ ostree_pack_file_for_input (GOutputStream     *output,
   GVariantBuilder pack_builder;
   GVariant *pack_variant = NULL;
   gsize bytes_written;
+  GChecksum *ret_checksum = NULL;
 
   uid = g_file_info_get_attribute_uint32 (finfo, G_FILE_ATTRIBUTE_UNIX_UID);
   gid = g_file_info_get_attribute_uint32 (finfo, G_FILE_ATTRIBUTE_UNIX_GID);
@@ -631,15 +633,10 @@ ostree_pack_file_for_input (GOutputStream     *output,
 
   if (S_ISREG (mode))
     {
-      bytes_written = g_output_stream_splice (output, (GInputStream*)instream, 0, cancellable, error);
-      if (bytes_written < 0)
+      if (!ot_gio_splice_and_checksum (output, (GInputStream*)instream,
+                                       out_checksum ? &ret_checksum : NULL,
+                                       cancellable, error))
         goto out;
-      if (bytes_written != object_size)
-        {
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                       "File size changed unexpectedly");
-          goto out;
-        }
     }
   else if (S_ISLNK (mode))
     {
@@ -680,7 +677,6 @@ ostree_pack_file (GOutputStream     *output,
   GFileInfo *finfo = NULL;
   GInputStream *instream = NULL;
   GVariant *xattrs = NULL;
-  gsize bytes_written;
 
   finfo = g_file_query_info (file, "standard::type,standard::size,standard::is-symlink,standard::symlink-target,unix::*",
                              G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, cancellable, error);
@@ -698,7 +694,7 @@ ostree_pack_file (GOutputStream     *output,
   if (!xattrs)
     goto out;
   
-  if (!ostree_pack_file_for_input (output, finfo, instream, xattrs, cancellable, error))
+  if (!ostree_pack_file_for_input (output, finfo, instream, xattrs, NULL, cancellable, error))
     goto out;
   
   ret = TRUE;

diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index 98bb36521eb9777df62def50c3cae7bed26e3c47..640ec7122f4633653f57a0120089ecfd99445287 100644 (file)
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -161,6 +161,7 @@ gboolean  ostree_pack_file_for_input (GOutputStream     *output,
                                       GFileInfo         *finfo,
                                       GInputStream      *input,
                                       GVariant          *xattrs,
+                                      GChecksum        **out_checksum,
                                       GCancellable     *cancellable,
                                       GError          **error);